From 4d08751ad2915ee728e222f73a61493b15f82c72 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sun, 10 Oct 2021 11:22:48 +0200 Subject: [PATCH] Fix tests on armel --- ...x-alignment-in-tests-for-armhf-armel.patch} | 18 +++++++++++++----- debian/patches/series | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) rename debian/patches/{0006-Fix-alignment-in-tests-for-armhf.patch => 0006-Fix-alignment-in-tests-for-armhf-armel.patch} (72%) diff --git a/debian/patches/0006-Fix-alignment-in-tests-for-armhf.patch b/debian/patches/0006-Fix-alignment-in-tests-for-armhf-armel.patch similarity index 72% rename from debian/patches/0006-Fix-alignment-in-tests-for-armhf.patch rename to debian/patches/0006-Fix-alignment-in-tests-for-armhf-armel.patch index e5d3111b..a87371e8 100644 --- a/debian/patches/0006-Fix-alignment-in-tests-for-armhf.patch +++ b/debian/patches/0006-Fix-alignment-in-tests-for-armhf-armel.patch @@ -1,12 +1,12 @@ From: Jochen Sprickerhof Date: Fri, 8 Oct 2021 19:22:51 +0200 -Subject: Fix alignment in tests for armhf +Subject: Fix alignment in tests for armhf/armel --- test/common/test_pointcloud.cpp | 1 + test/filters/test_crop_hull.cpp | 1 + - test/filters/test_functor_filter.cpp | 1 + - 3 files changed, 3 insertions(+) + test/filters/test_functor_filter.cpp | 2 ++ + 3 files changed, 4 insertions(+) diff --git a/test/common/test_pointcloud.cpp b/test/common/test_pointcloud.cpp index 2e43620..922177d 100644 @@ -33,10 +33,18 @@ index d46838a..fcac94c 100644 void diff --git a/test/filters/test_functor_filter.cpp b/test/filters/test_functor_filter.cpp -index e4a1190..03f541f 100644 +index e4a1190..741ffb1 100644 --- a/test/filters/test_functor_filter.cpp +++ b/test/filters/test_functor_filter.cpp -@@ -172,6 +172,7 @@ struct FunctorFilterFunctionObject : public ::testing::Test { +@@ -52,6 +52,7 @@ struct FunctorFilterRandom : public testing::TestWithParam { + + shared_ptr> cloud; + PointCloud out_cloud, negative_cloud, positive_cloud; ++ EIGEN_MAKE_ALIGNED_OPERATOR_NEW + }; + + TEST_P(FunctorFilterRandom, functioning) +@@ -172,6 +173,7 @@ struct FunctorFilterFunctionObject : public ::testing::Test { cloud.resize(2); } PointCloud cloud; diff --git a/debian/patches/series b/debian/patches/series index 59d021e5..85e3b3f2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,4 +3,4 @@ 0003-Use-newly-build-libs-when-testing.patch 0004-Disable-failing-tests.patch 0005-Adopt-unit-test-for-i386.patch -0006-Fix-alignment-in-tests-for-armhf.patch +0006-Fix-alignment-in-tests-for-armhf-armel.patch -- 2.30.2